From: Florian Müllner <fmuellner@gnome.org>
Date: Fri, 17 Jan 2014 13:25:49 +0000 (-0500)
Subject: workspacesView: Fix activating empty workspaces
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~2913
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=11d8640ba6e5cb3276d915a316f00f13a3568b8a;p=gnome-shell.git

workspacesView: Fix activating empty workspaces

By default, gesture actions no longer wait for the dnd threshold to
be reached before triggering, which breaks our mixing of click- and
pan actions. Fix this by only panning after reaching the threshold
and letting the click action go through if the pan is cancelled.

https://bugzilla.gnome.org/show_bug.cgi?id=722417
---

diff --git a/js/ui/workspacesView.js b/js/ui/workspacesView.js
index 1d0982b79..59e968275 100644
--- a/js/ui/workspacesView.js
+++ b/js/ui/workspacesView.js
@@ -405,7 +405,7 @@ const WorkspacesDisplay = new Lang.Class({
         Main.overview.addAction(clickAction);
         this.actor.bind_property('mapped', clickAction, 'enabled', GObject.BindingFlags.SYNC_CREATE);
 
-        let panAction = new Clutter.PanAction();
+        let panAction = new Clutter.PanAction({ threshold_trigger_edge: Clutter.GestureTriggerEdge.AFTER });
         panAction.connect('pan', Lang.bind(this, this._onPan));
         panAction.connect('gesture-begin', Lang.bind(this, function() {
             for (let i = 0; i < this._workspacesViews.length; i++)
@@ -413,7 +413,6 @@ const WorkspacesDisplay = new Lang.Class({
             return true;
         }));
         panAction.connect('gesture-cancel', Lang.bind(this, function() {
-            clickAction.release();
             for (let i = 0; i < this._workspacesViews.length; i++)
                 this._workspacesViews[i].endSwipeScroll();
         }));